Adjust multi-process docker image do build based on current workdir
Dominik Sander
2 changed files with 18 additions and 5 deletions
+ 17
- 4
docker/multi-process/Dockerfile
@@ -1,12 +1,25 @@ |
||
| 1 |
-FROM cantino/huginn-single-process:latest |
|
| 1 |
+FROM ubuntu:14.04 |
|
| 2 | 2 |
MAINTAINER Andrew Cantino |
| 3 | 3 |
|
| 4 |
-WORKDIR /app |
|
| 4 |
+ADD docker/scripts/prepare /scripts/prepare |
|
| 5 |
+RUN /scripts/prepare |
|
| 5 | 6 |
|
| 6 |
-ADD scripts/standalone-packages /scripts/standalone-packages |
|
| 7 |
+ADD docker/multi-process/scripts/standalone-packages /scripts/standalone-packages |
|
| 7 | 8 |
RUN /scripts/standalone-packages |
| 8 | 9 |
|
| 9 |
-ADD scripts/init /scripts/init |
|
| 10 |
+WORKDIR /app |
|
| 11 |
+ |
|
| 12 |
+ADD ["Gemfile", "Gemfile.lock", "/app/"] |
|
| 13 |
+ADD lib/gemfile_helper.rb /app/lib/ |
|
| 14 |
+ADD vendor/gems /app/vendor/gems |
|
| 15 |
+ |
|
| 16 |
+RUN chown -R huginn:huginn /app && \ |
|
| 17 |
+ sudo -u huginn -H echo "gem 'sqlite3', '~> 1.3.11'" >> /app/Gemfile && \ |
|
| 18 |
+ sudo -u huginn -H LC_ALL=en_US.UTF-8 RAILS_ENV=production ON_HEROKU=true bundle install --without test development --path vendor/bundle -j 4 |
|
| 19 |
+COPY . /app |
|
| 20 |
+ |
|
| 21 |
+ADD ["docker/scripts/setup", "docker/multi-process/scripts/init", "/scripts/"] |
|
| 22 |
+RUN /scripts/setup |
|
| 10 | 23 |
|
| 11 | 24 |
VOLUME /var/lib/mysql |
| 12 | 25 |
|
+ 1
- 1
docker/multi-process/scripts/init
@@ -46,7 +46,7 @@ echo "RAILS_SERVE_STATIC_FILES=true" >> .env |
||
| 46 | 46 |
|
| 47 | 47 |
chmod ugo+r /app/.env |
| 48 | 48 |
source /app/.env |
| 49 |
-sudo -u huginn -H bundle install --deployment --without test |
|
| 49 |
+sudo -u huginn -H bundle install --without test development --path vendor/bundle |
|
| 50 | 50 |
|
| 51 | 51 |
# use default port number if it is still not set |
| 52 | 52 |
case "${DATABASE_ADAPTER}" in
|